; Fix documentation of 'other-window'

* doc/lispref/windows.texi (Cyclic Window Ordering):
* lisp/window.el (other-window): Document ALL-FRAMES in interactive
invocations.

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index f076a6148a7973ae7ced8d82d4178461c97d19a4..b4692b980900e198ab3739cc360c89a2907a56a1 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2088,7 +2088,9 @@ argument.
 
 The optional argument @var{all-frames} has the same meaning as in
 @code{next-window}, like a @code{nil} @var{minibuf} argument to
-@code{next-window}.
+@code{next-window}.  When called interactively, @var{all-frames} is
+always @code{nil}, so only windows on the selected frame can be
+selected.
 
 This function does not select a window that has a non-@code{nil}
 @code{no-other-window} window parameter (@pxref{Window Parameters}),

diff --git a/lisp/window.el b/lisp/window.el
index 6eaa983f4c7165f882327169bb57132e894f7b38..5debf6ef11931aca3034a24e0ea858b433d970f9 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3973,7 +3973,8 @@ window parameter is non-nil.
 This function uses `next-window' for finding the window to
 select.  The argument ALL-FRAMES has the same meaning as in
 `next-window', but the MINIBUF argument of `next-window' is
-always effectively nil."
+always effectively nil.  Interactively, ALL-FRAMES is always
+nil, which considers all windows on the selected frame."
   (interactive "p\ni\np")
   (let* ((window (selected-window))
          (original-window window)